DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I27786fdcfa2b1b83e2f2b51d4087eb2d4dbafc56
tree: 67c662ade4c3c6c01b0cf5ffa7a3a1763950fa96
  1. src/
  2. __init__.py
  3. Android.mk
  4. AndroidTest.xml
  5. OWNERS