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

Change-Id: Ic189a0cbe00cbe0d8bff5fd84c1979c779b4e377