Merge "ld.config.txt: remove link from rs to vndk" am: 059b8dacfd
am: 57b4d65eff

Change-Id: I040b2512e3294186fbead8e2a268a274a1d10fb9