Merge "Stop using `group_static_libs` property"

tools/aapt/Android.bp

@@ -50,7 +50,6 @@ cc_defaults {
         "libbase",
         "libz",
     ],
-    group_static_libs: true,
 
     cflags: [
         "-Wall",

tools/aapt2/Android.bp

@@ -72,7 +72,6 @@ cc_defaults {
         "libidmap2_policies",
     ],
     stl: "libc++_static",
-    group_static_libs: true,
 }
 
 // ==========================================================
@@ -196,9 +195,9 @@ cc_test_host {
     ],
     defaults: ["aapt2_defaults"],
     data: [
-         "integration-tests/CompileTest/**/*",
-         "integration-tests/CommandTests/**/*",
-         "integration-tests/ConvertTest/**/*"
+        "integration-tests/CompileTest/**/*",
+        "integration-tests/CommandTests/**/*",
+        "integration-tests/ConvertTest/**/*",
     ],
 }
 

tools/split-select/Android.bp

@@ -48,7 +48,6 @@ cc_defaults {
         "libbase",
         "libz",
     ],
-    group_static_libs: true,
 
     target: {
         windows: {