Merge "Re-format ld.config.*.txt files"