Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: c471d57340

Change-Id: I7ae69d8e75563a45ff460676ca9ed954084212c9
tree: daf7abb595add3ce148b4cdf118a21df2144cfe4
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml