Merge "Fix module-file name collisions" am: 8e3e3530e8 am: b86f65e55c

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

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

cmds/monkey/Android.bp

@@ -10,5 +10,5 @@ package {
 java_binary {
     name: "monkey",
     srcs: ["**/*.java"],
-    wrapper: "monkey",
+    wrapper: "monkey.sh",
 }