am 3f6f7eee: am 71ae8832: Merge "Remove fuzzer build-time dependency on core image."

* commit '3f6f7eee7e167295049447bc4ed4c7cb2701a109':
  Remove fuzzer build-time dependency on core image.