Merge "Rename libkeymaster to libkeymaster_staging"