am 59d411c8: Merge changes I57b49033,I03ddf981 into klp-volantis-dev

* commit '59d411c8955332349e09f788047b57b2b64eee5e':
  Revert "Disable recovery in PDK builds"
  pdk: add bouncycastle-host javalib.jar to platform.zip