Rename libkeymaster to libkeymaster_staging
authorJanis Danisevskis <jdanis@google.com>
Mon, 16 Oct 2017 01:32:50 +0000 (01:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Oct 2017 01:32:50 +0000 (01:32 +0000)
am: 8cd5614c12  -s ours

Change-Id: I46c0d6d745171ee77a74fb4a183b9121be89d12b


Trivial merge