Merge changes I57b49033,I03ddf981 into klp-volantis-dev

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