[automerger skipped] Merge Android U (ab/10368041) am: 4484eb1bfd -s ours

am skip reason: Merged-In I849958d9e9de3be48e32f57acc7b3526e184482c with SHA-1 8cbbc2dc92 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24183044

Change-Id: Id2d7c83c8284edbd1fd11ec9944f58ddb8332327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 5a7d0fc..44907a1 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -41,9 +41,8 @@
     ],
 }
 
-cc_binary {
+cc_binary_host {
     name: "simg2img",
-    host_supported: true,
     srcs: [
         "simg2img.cpp",
         "sparse_crc32.cpp",
@@ -62,9 +61,8 @@
     },
 }
 
-cc_binary {
+cc_binary_host {
     name: "img2simg",
-    host_supported: true,
     srcs: ["img2simg.cpp"],
     static_libs: [
         "libsparse",