Merge "Temporary disable linker-namespaces"
am: a8be6ae6fc

* commit 'a8be6ae6fcf1c58c0c2067739352e16b92972c41':
  Temporary disable linker-namespaces