Clean up some linker config inconsistencies.
am: d00f129f1b

Change-Id: Id2f2aefbb6bf4c411e1c4db4f90c7d152707fa92