Merge 1086a46f1ec7726918b0ba0ef909ca3387c19ab0 on remote branch

Change-Id: I80892f71dccc919b7726b5710430f05e8b77b8f4
tree: 6352b1dce6dcb82c918e9423d1a13b9d7c6538d2
  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