Merge "Revert "Introduce conscrypt linker namespace.""
am: e606e00042

Change-Id: If644c8cb83478ac12f218ac0faa90ebd32686b72