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

Change-Id: Ia720a7f87647888410235c356b9e88fc3a2a7c62