Merge "Revert "Revert "Introduce conscrypt linker namespace."""
am: 4d30819263

Change-Id: Id1eee73e7f736965771767a0612fd3318f12305f