Update android_ide_common to 25.0.0 and clean up FolderConfigs

Older android_ide_common does not handle BCP 47,
so we update the code to handle that and remove
most of the workarounds. This also pulls in a
fix for 3-letter locales, unblocks resource
shrinking whitelisting, etc.

--
MOS_MIGRATED_REVID=135396457

1 files changed, 3 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
index d682144ef7..f622253332 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
@@ -70,7 +70,7 @@ public class AndroidDataMerger {
         dependency.deserialize(serializer, parsedDataBuilder.consumers());
       } catch (DeserializationException e) {
         if (!e.isLegacy()) {
-          throw new MergingException(e);
+          throw MergingException.wrapException(e).build();
         }
         logger.fine(
             String.format(
@@ -307,7 +307,7 @@ public class AndroidDataMerger {
       return doMerge(
           transitive, direct, parsedPrimary, primaryData.getManifest(), allowPrimaryOverrideAll);
     } catch (IOException e) {
-      throw new MergingException(e);
+      throw MergingException.wrapException(e).build();
     }
   }
 
@@ -441,7 +441,7 @@ public class AndroidDataMerger {
           primaryBuilder.build(),
           transitiveBuilder.build());
     } catch (IOException e) {
-      throw new MergingException(e);
+      throw MergingException.wrapException(e).build();
     }
   }
 }