Merge "bouncycastle: Android tree with upstream code for version 1.77" into upstream-master