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

Bug: 112535855
Change-Id: I58405715a1ebce047ee50f22e2645390e5d052d6
tree: 38585628d7e07fdfb8452cc9efb826ee3943e3b8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml