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

* commit '9a0b658c9c1f8f4492f61a75909e5ca2f05c3ac1':
  More linker cleanup.