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