Snap for 4620899 from cb68d44d8ab132cd032bdc94fa6580dd5212cf55 to pi-release

Change-Id: I90c5b78e219352affb83fc880589acfe1bcdf23b
tree: 79813b6a37595debeeb0ab3110fdf93cb9c5cdde
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml