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

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