Merge "Make simg2img host-only" into main am: 5aa25bf3 am: f148dbb4 am:...

Merge "Make simg2img host-only" into main am: 5aa25bf3 am: f148dbb4 am: edd616e9 am: 0b24dcf8 am: 0a09f85c

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



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