am c41dcad0: Merge "More linker cleanup."

* commit 'c41dcad040ede2975ea63e383a8a3d36e3642d56':
  More linker cleanup.