Merge "Fix visibility rules now that Make supports visibility checks" am: 94dddf5cfc am: b9202df9da

Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1328013

Change-Id: If0fb7590e6ad021de3a5d6c9f4f838473dc2f80e