Merge "ART: Finish old move of OatDexFile"