Reconcile with jb-release

Change-Id: Ic25a71c0dcde3cda15caaafd93004f477671db24
tree: 1eb961dcc531e0a0c98ac5fcb9973178b9dc3ff2
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/