Merge "pixel3_maineline: Add changes to get pixel3_mainline building a boot.img" am: bb0b72c7da am: 63ca3779f1

Change-Id: Ie2c4332302d9cb31355509b8764de0f8d8468157