Merge "Revert "Consistently use either "boot" or "apex" boot image as the default."" am: 18577fe8fb am: cbb1de50d6

Change-Id: I5c5d0df30117804332d8f27b9f5bf18744126fc4