Merge \"Revert \"Dump more dex file data in oatdump\"\"
am: 7598736db0

Change-Id: I2d2efa7dbbd64d28d5ed80dc00940ca1e284e39d