Merge "Add intra-core API required by conscrypt"