Snap for 4620899 from dcc4e38d1d67878bb2b4ee99c7cf9d9a387aaef7 to pi-release

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