am d835cc86: Refactor of keymaster build, to suppor keystore unit test build.

* commit 'd835cc86e08adff36bde154e81c376168a386ce6':
  Refactor of keymaster build, to suppor keystore unit test build.