Merge "external/bouncycastle: add algorithms for PbeWithHmacSha mac variants"