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

Change-Id: I3a24e451d81d865e0be6e60cb78a1a1bf90c8310