Merge "cargo2android: reorder TEST_MAPPING statements" am: 7534ce72da

Original change: https://android-review.googlesource.com/c/platform/development/+/1488686

Change-Id: I39a2baccb693fc7dfa4201e8c7e07c81bbc4c0b8

scripts/cargo2android.py

@@ -203,11 +203,10 @@ class TestMapping(object):
         if not is_first:  # add comma and '\n' after the previous entry
           outf.write(',\n')
         is_first = False
-        outf.write('    {\n      "name": "' + name + '"')
+        outf.write('    {\n')
         if host:
-          outf.write(',\n      "host": true\n    }')
-        else:
-          outf.write('\n    }')
+          outf.write('      "host": true,\n')
+        outf.write('      "name": "' + name + '"' + '\n    }')
       outf.write('\n  ]\n}\n')