Merge "Make the boot image always multi-image."
am: 146183209c

Change-Id: Ia10cb4f13f6d6831b350d98996de0bbdab23575c