Merge "verity: delete keystore_signer"