Merge "Temporary disable linker-namespaces"