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

Change-Id: I64bd737c1b642851965e96bf6883d2457cd21aca