Merge "Address ld.config.txt comments."
am: cec980dc66

Change-Id: I210b4debd115dd10c86e96f0c5b7040691590516