Merge 1c9149337b6282a58a344554807ec6678ceced3e on remote branch

Change-Id: I4c6d3395d09372b2eda56ba4b896f113f73e5671
tree: d4ef0bb99794293fd8706a88cb87dd33c9f0e93e
  1. base/
  2. benchmarks/
  3. include/
  4. tests/
  5. Android.bp
  6. EventFlag.cpp
  7. FmqInternal.cpp
  8. OWNERS
  9. PREUPLOAD.cfg
  10. TEST_MAPPING