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

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



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