Merge "Fix some typos in the linker configuration file format documentation." am: 639ad55176
am: 10541de1fa

Change-Id: I44dd0456f8dc1886bb994425e12275f4b6edd6d7