Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"
am: 0d2a75510c

Change-Id: Ief93d3abce6191326caa9b0d19e9cd3f89bd8bfa