Merge d61bf0d46f827240f8e197c06f94759b7b95b216 on remote branch

Change-Id: I77ac730d0649f13d0f7251f8915b7cff4acc9026
tree: 3a5659cdf3bf27abcc5e8d19ab9af69b86eb7b96
  1. benchmarks/
  2. include/
  3. tests/
  4. Android.bp
  5. EventFlag.cpp
  6. FmqInternal.cpp
  7. OWNERS
  8. PREUPLOAD.cfg