Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I9ed1c83e0ebc8f88cfa40e60ae8529601952ac16
tree: 7829d21231a26c077a07325cf4d9aa61f82ce105
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.mk
  7. AndroidManifest.xml