Merge \\\\"Revert \\\\"Revert \\\\"Dump more dex file data in oatdump\\\\"\\\\"\\\\" am: 05d9a647 am: 9c26f225 am: fe788fe5 am: fa5cb55a Change-Id: Id72a042934e87e9021dd7cf7b63b23e6545f1f0e