[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 7330df16d1  -s ours

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