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