Merge "Revert "pixel3_maineline: Add changes to get pixel3_mainline building a boot.img""