Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I3827f67d0a23e1c69ea0491c120e8ea37fa554be
tree: 845eb03a40493d9be0c28c66c24a4cfc5a746da4
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml