1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
index e3e7234f41..3c857f4a78 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
@@ -70,7 +70,8 @@ public class AndroidDataWriter implements Flushable, AndroidDataWritingVisitor {
               StandardOpenOption.CREATE_NEW,
               StandardOpenOption.WRITE)) {
         writer.write(START_RESOURCES);
-        for (FullyQualifiedName key : valueFragments.keySet()) {
+        for (FullyQualifiedName key :
+            Ordering.natural().immutableSortedCopy(valueFragments.keySet())) {
           for (String line : valueFragments.get(key)) {
             writer.write(line);
             writer.write(LINE_END);
@@ -207,7 +208,7 @@ public class AndroidDataWriter implements Flushable, AndroidDataWritingVisitor {
   public void copyResource(Path source, String relativeDestinationPath)
       throws IOException, MergingException {
     Path destinationPath = resourceDirectory.resolve(relativeDestinationPath);
-    if (source.getParent().getFileName().toString().startsWith(SdkConstants.DRAWABLE_FOLDER)
+    if (!source.getParent().getFileName().toString().startsWith(SdkConstants.FD_RES_RAW)
         && source.getFileName().toString().endsWith(SdkConstants.DOT_PNG)) {
       try {
         Files.createDirectories(destinationPath.getParent());