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

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

Change-Id: I0cae1380d45601ea9c2da048e4f06d16eebabd6c