Merge 6a04e795cc9ed2b38527acd468eea9252cb6f139 on remote branch

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