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

Change-Id: Ie6bd038afae252b6772275285c88711659dbb356