Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"