Merge "pixel3_mainline: Add changes to get pixel3_mainline building a boot.img (v3)"