Merge "Fix CL split and build"
tree: 3f37922a45e1b6755e1072a1022d95c36b349bcc
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/