Merge \"Revert \"Revert \"Dump more dex file data in oatdump\"\"\"
am: 05d9a647a6

Change-Id: Id0e8315df8d934d1ac652c8baa520ba58d2db19d