Merge "ld.config.txt: Link vendor vndk ns to default ns"