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

Change-Id: Iedbc4a80b76de238520caada3f4ed1efa878f18b
tree: eaefd672e595b6612dfda7bda1abe4a176d46212
  1. lib/
  2. test/
  3. tools/
  4. Android.bp
  5. LICENSE.TXT
  6. OWNERS