Merge \"Don\'t depend on Bouncy Castle.\"
am: 1fb96c3ff5

Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325