Merge stage-aosp-master into pi-dev-plus-aosp

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