[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: a7548a64f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I5d18a7ec0c4ddbe4bcb7504edd30fd500b6ab46e
tree: 9fa1607f1d27e9cc931723d14fb9d7b29719e4d5
  1. bin/
  2. include/
  3. lib/
  4. share/
  5. .gitignore
  6. LICENSE
  7. NOTICE
  8. OWNERS