Merge "Revert "Introduce conscrypt linker namespace.""