Merge "ART: Better error reporting on broken oat file"