Merge "ART: Be more robust with multidex uncompressed-dex odex files" am: 1ec2f3eb0a
am: 0750bb648c

Change-Id: I672206ed89b2a1d3b99881c8cabfa7baed709d58