Merge "Fix module-file name collisions" am: 92f4e14b am: b88cb3e1 am: 1d4139e7 am: 645e261b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594



Change-Id: If10153a1ccd76dc65295db1e73419dbcd5276350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/am/Android.bp

@@ -30,7 +30,7 @@ cc_library_host_static {
 
 java_binary {
     name: "am",
-    wrapper: "am",
+    wrapper: "am.sh",
     srcs: [
         "src/**/*.java",
         "proto/**/*.proto",

cmds/appops/Android.bp

@@ -19,5 +19,5 @@ license {
 
 sh_binary {
     name: "appops",
-    src: "appops",
+    src: "appops.sh",
 }

cmds/appwidget/Android.bp

@@ -19,6 +19,6 @@ license {
 
 java_binary {
     name: "appwidget",
-    wrapper: "appwidget",
+    wrapper: "appwidget.sh",
     srcs: ["**/*.java"],
 }