Merge "ld.config.txt: Move vendor vndk to vndk namespace"