merge in jb-release history after reset to jb-dev
tree: c637f6420271215b27cc0024aa4e1aa7641da793
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/