Merge "Excluding the ramdisk from GKI boot images"