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

Change-Id: If3ca8d2b0e419158ac362e0eeebc81a06907edf8