Merge "Also return vdex file from DexFile.getDexFileOutputPath"