Merge "Update VNDK paths in VTS test cases" am: 2b5d6e2c0f
am: 17d42f54da

Change-Id: I7364d0563a631caa172db590f68c2acdfbb37bbe