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

Change-Id: I44e5a6cf2fa976dddd882107ffc152a602778fd9