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

Change-Id: I6d09b08e351468a885749463d4b44029566487b5