Merge "Revert "pixel3_maineline: Add changes to get pixel3_mainline building a boot.img"" am: 4d4e2fb0c1 am: 6b6297b6d2

Change-Id: Ib79bb9275e70e0e02c78f76c35c589d8fcf52f16