Merge "Convert to StandardDex in fixup_dex_dex_file"