Merge "Temporary disable linker-namespaces"
am: 9fb5047549

* commit '9fb50475497ab66ad547ffd17cc5a611b422cd09':
  Temporary disable linker-namespaces