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

Change-Id: Iebc9e79fbbcf7d9217bea7bd5876bf7eedfc72cd
tree: 36e27a9a20a7fc29e5399f8c352c694587a61301
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml