am 2ca3b1b2: Fix CL split and build

* commit '2ca3b1b25e8ceb841396061a318d3a043cbfcb54':
  Fix CL split and build
tree: 3f37922a45e1b6755e1072a1022d95c36b349bcc
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/