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

Change-Id: I8ca367616fa84260ec64fceeecfb975e13d20b98