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

* commit '5673f9f73b545c8b4801c1494600ff2220bf8dca':
  More linker cleanup.