Merge "ART: Remove implicit boot image error aborts"
am: cf35bb5b2a

Change-Id: If19c6bb03d69564a8ca43c3a397ce430f6a7022e