Merge "Cleanup: update VNDK path" into rvc-dev