Merge "Revert "Temporary disable linker-namespaces""