Merge "Add OAT file mapping to dexdiag"