Merge "Cleanup: update VNDK path" into rvc-dev am: 178660e3d2

Change-Id: Iab86d6eca4c39f5c613c4acf95d0a98039bb8478