Merge "Output boot images with kernel 5.15 in gki_$arch" am: a2d6273e8a am: 0d9181921c

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

Change-Id: I18ddada60628beb5274fdec872c03690bc1b01d5