Snap for 4701683 from 3ea9448f8d88173240440f85a739195c353de9ee to pi-release

Change-Id: If59141ff38a3a5cde924f3df8c35fb3589f9f9cb
tree: 9a15dfec23d8fc0b718fb62f7859a9f254e91b9b
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml