Merge "ld.config.txt: remove link from rs to vndk"