am 9b24822a: Merge "Add bouncy castle to the tools prebuilts."

* commit '9b24822a30bdaf4f17f754a6c6cbcfba89f0eec5':
  Add bouncy castle to the tools prebuilts.