Bouncycastle upstream code, version 1.49, plus Android tree, minus patches
Merge "bouncycastle: Android tree with upstream code for version 1.49" into upstream-master