Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: 3e21821be8 am: 5e78e9e93a am: c2aaa90b6e

Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971

Change-Id: I566141c764e9c1edb9d0f99cc79af7b0b1e3aa24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/hierarchyviewer/etc/Android.bp b/hierarchyviewer/etc/Android.bp
index 82ba8e8..c357988 100644
--- a/hierarchyviewer/etc/Android.bp
+++ b/hierarchyviewer/etc/Android.bp
@@ -18,5 +18,5 @@
 
 sh_binary_host {
     name: "hierarchyviewer1",
-    src: "hierarchyviewer1",
+    src: "hierarchyviewer1.sh",
 }
diff --git a/hierarchyviewer/etc/hierarchyviewer1 b/hierarchyviewer/etc/hierarchyviewer1.sh
similarity index 100%
rename from hierarchyviewer/etc/hierarchyviewer1
rename to hierarchyviewer/etc/hierarchyviewer1.sh