am 234720eb: Merge "Adding unbundled build target for bouncycastle"

* commit '234720ebe66540a53cff98b2448dddbc884bd09f':
  Adding unbundled build target for bouncycastle