[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: e35659e489  -s ours

Change-Id: I39a1f004d13dc9abf004205dde0a3d2f1cf21f9b
tree: 79f0ef23da69c9816bbafd175f8e21d7b79c8860
  1. src/
  2. __init__.py
  3. Android.mk
  4. AndroidTest.xml
  5. OWNERS