Merge d80f5d9d859636ad40191014de7735b449fe4240 on remote branch

Change-Id: I54e13bf1b7ee159f63aec7321402dee377d56d21
tree: fced7922414aa2c66a73af722daa5d4c2f04c0b4
  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