am 41f338c6: Merge change 7511 into donut

Merge commit '41f338c6c6780d054a26cc4995f48ccce3163c8e'

* commit '41f338c6c6780d054a26cc4995f48ccce3163c8e':
  Support addPkcs12Keystore function in CertTool library.