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

Change-Id: Ia2c34ef8b9d744d41792a7bd279f2575a860af21