Merge "remove link from rs to vndk" am: 5fc7297464
am: 4dd62fd224

Change-Id: I52aca23daa3520968197b2b77a46fdfaeb8f61ea