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

Change-Id: I79b440e743e48745b6e8518fc5215478326b7217