Merge "Refactor keystore." am: e4f2fa54b0
am: 63e1e79476  -s ours

* commit '63e1e794768d2960f95b569ad587847d7e14b8ba':
  Refactor keystore.
tree: da484267ab96b7b0bd3dfc05676dad44783f0ef4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE