am c1a5d20d: am 9a0b658c: am c41dcad0: Merge "More linker cleanup."

* commit 'c1a5d20d08118bb778f99b14ca74d6654e4f4eba':
  More linker cleanup.