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

Change-Id: Ieca28957cabade9c407fcba068ca48f30475f2c2
tree: fa5ce81022dd92e3d95aea1eb8cc3a8310c80ff1
  1. Android.bp
  2. LICENSE
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. OWNERS
  6. abr/
  7. inc/
  8. src/