Merge "Fix race in ld.config.txt tests"