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

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