Merge "Also return vdex file from DexFile.getDexFileOutputPath" am: a654e0378a am: cdb70c56da
am: f4e5ef6c6b

Change-Id: I238f5afaa0445f841b2b73e391a34f36dbc166bb