Merge "Move conscrypt module core platform API to external/conscrypt"