Merge "Remove deprecated BouncyCastle algorithms" am: b5c045acb5

Change-Id: I0f11a3c9da7ebf64aefc0b92195ba21dd87b5084