Add back omnirom's own keymaster

Change-Id: Ib5b3e0c458358a8df343559d318bdc30fc515e46
Revert "Add back omnirom's own keymaster"

This reverts commit 6ebb0cef0379de581a53de5f92b5754f6d1de0e9.
Add back omnirom's own keymaster

Change-Id: I304c10b6b0f4c182fa0fbf6aaec2560c4e7ee6cf