Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable"

This reverts commit ea3b820b93f2059360804eab119d309945250fd9.

Reason for revert: build breakage

Change-Id: Ib101a5e896ffa816a7b9fb46774113846fa82590
2 files changed
tree: 741401fde3e543ef31ef61bd2bc66fe57a56dbc5
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE