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

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