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

Change-Id: Ia51a8721f603445843ea264dbf3a2f66bad160f7