Merge "ART: Fix oatdump dex export" am: c022b9aa68
am: 2c4418f1d4

Change-Id: Iddcafa64d27301e5dccd8ba82487c01a5fc03332