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

Change-Id: If0d9afc6f4c50a55b967a20a03416cf154325183
tree: 2633c18f04ad218ce9650bb81bc9931282e87faa
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml