Merge "Revert "Dump more dex file data in oatdump""