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

Change-Id: I7337ddac25f5eeac5674c4c65457a80b43d221f7