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

Change-Id: I8ed32707e2c87b1c7808b53f0be93b07c0c87870