Rename libkeymaster to libkeymaster_staging am: 8cd5614c12  -s ours
am: 157fc5bd51  -s ours

Change-Id: If22b7aa39e8c21a02673ac05cfd12b058bf78b91