Merge "Keystore2: Delete all super keys."