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

Change-Id: I8902948bc2a4c363269f9b59e15a5c2508a3b340
tree: 6367992681dfe95b532d32eae2285f77cf5df29f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags