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

Change-Id: Iba8525fb7bdb0dd5e8c7333e68816ac2979af59a