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

Change-Id: Ie6a78ccffd792f0aac10a48ee022cc9eb7c259ba