Merge "ART: Finish old move of OatDexFile"
am: f5020eecfd

Change-Id: I9da9fd94ea327eebbc13b5464f00a3acc87b3f64