Merge b6a1f3570fdb92f639e34c568d351052f157c4ba on remote branch

Change-Id: I95d39679b98070391e7d932e52c235a39dcebe2d
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