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

Change-Id: I586cf6ddda1716052605aca6148c8a8f0f5f60bd