Merge "Temporary disable linker-namespaces" am: a8be6ae6fc
am: 861e58d1c5

* commit '861e58d1c5eeac5bfa97765c93f20649f916bde8':
  Temporary disable linker-namespaces