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

Change-Id: I207bd3b4148621fde1ea345da7f92a4d3527c3f6
tree: 4514ebbc07948b1be4447bba26bbd91d1c6fad01
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.mk
  7. AndroidManifest.xml