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

Change-Id: I0fdd8f0d780644833cb250b36c212bcbd8bf799b
tree: 1fad69e9ccfdc7153e19f9e46638b31010a65e4e
  1. Android.bp
  2. LICENSE
  3. METADATA
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. OWNERS
  7. src/