am 77c4e48e: Merge "Fix CL split and build"

* commit '77c4e48e80b989cb80599a40fbbad9a16745d89f':
  Fix CL split and build
tree: 0baec697516ce1cf354452d66a57a4bb4d7fa868
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/