Merge "oatdump: Convert cdex before exporting dex files"
am: 0fb4f9f477

Change-Id: Ica36c31ae652fefc3184b17bbc7c8d5052046d41