Split libkeymaster1 into libkeymaster and libkeymaster_portable

Also removed unused include

Bug: 37467707
Test: trivial
Merged-In: Ie029462cb79d7aec28a37aac22f04ce73ebac8da
Change-Id: Ie029462cb79d7aec28a37aac22f04ce73ebac8da
(cherry picked from commit 5cc0d5ee603e436643c4f23fab91a0514c2d462d)
2 files changed