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

Change-Id: If0c5f0dba61d9187016d44947ac1b37b7e1a09ad