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

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

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