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

Change-Id: Iba5c6db42576395752c1ebaf7e4aa1977035e99c