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

Change-Id: Icdfe535ef109dbba6d1fb92f81db36707e8f06c2