libkeymaster1 split to libkeymaster and _portable
authorJanis Danisevskis <jdanis@google.com>
Mon, 16 Oct 2017 01:32:45 +0000 (01:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Oct 2017 01:32:45 +0000 (01:32 +0000)
am: ab887a4433  -s ours

Change-Id: I0e5c0ab09b96bd6888178fbba2148fcb49117cff


Trivial merge