Merge stage-aosp-master into pi-dev-plus-aosp
am: 136cda1314

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