Merge "Build: Make dex2oat boot image error abort explicit" am: 87dded4494
am: f1d0d93fa2

Change-Id: I305650e2cbc3d523ffa236b282a29da10b3ec469