Merge "Make Keystore2's crypto operations their own crate"