Merge \\\"Don\\\'t depend on Bouncy Castle.\\\" am: 1fb96c3ff5 am: 3b36c7960d
am: 37a8cc5f51

Change-Id: I9dda235b0c6b9de7183a07c9b932f5a6a573281f