Fix module-file name collisions am: 7b6acb3f2d am: d95892caec am: 60be16fba5 am: ed3028295b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203961

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

soundtrigger/2.3/cli/Android.bp

@@ -9,7 +9,7 @@ package {
 
 java_binary {
     name: "sthal_cli_2.3",
-    wrapper: "sthal_cli_2.3",
+    wrapper: "sthal_cli_2.3.sh",
     srcs: ["java/**/*.java"],
     static_libs: [
         "android.hardware.soundtrigger-V2.3-java",

soundtrigger/aidl/cli/Android.bp

@@ -9,7 +9,7 @@ package {
 
 java_binary {
     name: "sthal_cli_3",
-    wrapper: "sthal_cli_3",
+    wrapper: "sthal_cli_3.sh",
     srcs: ["java/**/*.java"],
     static_libs: [
         "android.hardware.soundtrigger3-V1-java",