Merge "Update Bouncy Castle to 1.61"