Merge "Remove libkeymaster_staging"