Merge "Add OAT file mapping to dexdiag" am: ce121a5fe3 am: bd142395cd am: 2092b80697
am: 972a8c4eda

Change-Id: I5aa38d1c1070dcfd7ed229d72c6670dce38e4d19