Merge "Added keystore2_unsafe_fuzzer"