Snap for 4611397 from 5133d985daa4ca0354d2df4a1ca249c42b2cf78b to pi-release

Change-Id: I4d829a6434e8d5f4bde54dc9b63f8b3dab90ebd5
tree: 3848fb2a84789c29dc55ff75e0acc0e242ba52f3
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml