Merge changes I317cd97a,I1f3d16e0

* changes:
  fmq_fuzzer: reduce the frequency that we mess with the counters
  fmq_fuzzer: remove TODO and create function to get counter ptrs
tree: eb717290ac760d684b6c8f988493768d03ff0fac
  1. base/
  2. benchmarks/
  3. fuzzer/
  4. include/
  5. tests/
  6. Android.bp
  7. EventFlag.cpp
  8. FmqInternal.cpp
  9. OWNERS
  10. PREUPLOAD.cfg
  11. TEST_MAPPING