Rename libkeymaster to libkeymaster_staging
am: 8cd5614c12  -s ours

Change-Id: I46c0d6d745171ee77a74fb4a183b9121be89d12b