Merge "Enhance coverage options to include those needed by Honggfuzz for...
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" am: 0d2a7551
am: 98025a15
Change-Id: I03ebba4e16eb1f59b278ac53b0e5eccb7e111d61