Snap for 4765094 from edd989d065d5325cb4b564e6fd2e828376ac444b to pi-release

Change-Id: Ia16779c0eeb5834cab2256466ba5ab3de2da370a
tree: 60f23bc09cf289ed662d96b988a208acd623526f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml