Merge "Also return vdex file from DexFile.getDexFileOutputPath" into oc-dev
am: 026236997e

Change-Id: Iaa55ed97e78681738427693a1cd7c8536fe0327e