am 91115fd6: am 5b4aa6db: Merge change 26315 into eclair

Merge commit '91115fd698c492c276307008ae533c22ebc46994'

* commit '91115fd698c492c276307008ae533c22ebc46994':
  VpnService: use Credentials instead of CertTool.