am 155e8d1d: Merge "More dynamic linker cleanup."

* commit '155e8d1df5b8fdfeabda3e7b61d95beb5b8d1467':
  More dynamic linker cleanup.