Merge "Allow on-device signing daemon to talk to keystore."