Merge "Fix a typo in linker configuration comments."
am: ecef987a35

Change-Id: I0751095b88ad8acd0e712ee19fdd8d439b63b2d8