Merge "Make simg2img host-only" into main am: 5aa25bf3ae am: f148dbb40d

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

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