Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" am: 380fcee20e am: 2a87991836 am: d8daea527c

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

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