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

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

Change-Id: I56c2373db45dc3964659a722ea3474f16566a7e5