Merge "Re-format ld.config.*.txt files"
am: eef035f641

Change-Id: I0c840069e3ec17a051427e52e99ece6cfc53e93f