Revert "libkeymaster1 was split into libkeymaster and _portable"

This reverts commit beee35c850632c3e1b006242122665a84a5fc7f6.

Reason for revert: fix broken build

Change-Id: I60762c834b6837c78027574dda54c5382dbcceec
1 file changed