2 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
index dfc0496476..d1cc857dfa 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
@@ -32,6 +32,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 
 import com.android.resources.ResourceType;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
@@ -78,7 +79,9 @@ public class DataResourceXml implements DataResource {
       KeyValueConsumer<DataKey, DataResource> combiningConsumer)
       throws XMLStreamException, FactoryConfigurationError, IOException {
     XMLEventReader eventReader =
-        xmlInputFactory.createXMLEventReader(Files.newBufferedReader(path, StandardCharsets.UTF_8));
+        xmlInputFactory.createXMLEventReader(
+            new BufferedInputStream(Files.newInputStream(path)),
+              StandardCharsets.UTF_8.toString());
     try {
       // TODO(corysmith): Make the xml parsing more readable.
       while (XmlResourceValues.moveToResources(eventReader)) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
index 4e78428b88..15c551f6a5 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
@@ -85,11 +85,11 @@ public class ParsedAndroidData {
 
     private void checkForErrors() throws MergingException {
       if (!errors.isEmpty()) {
-        StringBuilder messageBuilder = new StringBuilder();
+        MergingException mergingException = new MergingException("Parse Error(s)");
         for (Exception e : errors) {
-          messageBuilder.append("\n").append(e.getMessage());
+          mergingException.addSuppressed(e);
         }
-        throw new MergingException(messageBuilder.toString());
+        throw mergingException;
       }
     }