reset to sh_binary for com.android.gki.preinstall am: 52b5cecf1e am: eeeed87449 am: 392d7b84d8 am: e1253d124c am: 5f39b354f7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Gki/+/2121373

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

Android.bp

diff --git a/Android.bp b/Android.bp
index eb7729b..509ffa3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,16 +61,10 @@
     private_key: "com.android.gki.pem",
 }
 
-// Use cc_prebuilt_binary because sh_binary does not support product_specific.
-// TODO(b/169954965): Change to sh_binary when product_specific is supported.
-cc_prebuilt_binary {
+sh_binary {
     name: "com.android.gki.preinstall",
     product_specific: true,
-    srcs: ["preinstall.sh"],
-    apex_available: ["com.android.gki.*"],
-    strip: {
-        none: true,
-    },
+    src: "preinstall.sh",
 }
 
 // Common defaults for all GKI APEXes.