Merge cb0f6b48acc163aa7e5d99c5619750e90919b8e1 on remote branch

Change-Id: Id262e000baaa4341b33b31b418bd921aa50a8348
tree: 30ce55f1cf96001129b8c7b187d6beff23ffdc37
  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