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

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