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

Change-Id: If26449caae94fb2e372c382d25033930f3c6d5b5