Merge "Better error reporting when loading dex files"