Merge "Add OAT file mapping to dexdiag" am: ce121a5fe3
am: bd142395cd

Change-Id: Ib8d74e986936e095db1de324d4ef3fca30e963ed