DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

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