Merge stage-aosp-master into pi-dev-plus-aosp
am: 1a423f3958

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