Merge changes from topic "keymaster_stl_none"

* changes:
  Rename libkeymaster to libkeymaster_staging
  Split libkeymaster1 into libkeymaster and libkeymaster_portable
  Remove use of UniquePtr from keystore