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