Merge "Fix remaining diffs for init_boot and boot images" into main am: c89ef83b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3367681



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