Merge "Consistently use either "boot" or "apex" boot image as the default." am: 13c929e32e am: 292aed498c

Change-Id: I8845889cc81b480c2dec0972e06b69e4aa4c93c4