am 57fc4114: Merge change 24132 into eclair

Merge commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d' into eclair-plus-aosp

* commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d':
  Add two CertTool helper classes.