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

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