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

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

Change-Id: Ib4539b0325d56b171059a2ff34de1b8b1e94017d