Revert "libkeymaster1 split"

This reverts commit c5bb8c74d1265d4bd8827e66f884c72e7e1d896b.

Reason for revert: build breakage

Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a
1 file changed