am 2f629d3e: Merge "Add Bouncy Castle to classpath in run-libcore-tests."

* commit '2f629d3eff3e73b64efdc95b90446d1ff8d4e831':
  Add Bouncy Castle to classpath in run-libcore-tests.