Merge "remove link from rs to vndk"