Merge "More @CorePlatformApis for bouncycastle"
am: fc42a49b94

Change-Id: I45ab0399a90689614d22be82efff9705c51964a4