Merge "Remove BouncyCastle methods from CorePlatformApi surface."