Merge "Remove fuzzer build-time dependency on core image."