Merge "Add targets for building boot.img with GKI" am: 16d4261d25

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1935340

Change-Id: I2ab7ce53dd5c1ec707b778dad898d2dd5b382ae3