Merge a05f7fb50a60d7540b1c65632d7a9b99ae919997 on remote branch

Change-Id: I54eab217dc55ffe8e6f95e1c07efed87260f13f1
tree: e8f1195c33f9fb01b3a48cb4e52ee14279bbc140
  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