libkeymaster1 split to libkeymaster and _portable
am: ab887a4433  -s ours

Change-Id: I0e5c0ab09b96bd6888178fbba2148fcb49117cff