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

Bug: 112535855
Change-Id: I9982ce14e3cc17a2de8afc680ef4fce140c4935c
tree: 03ff570844b80fc818d7c58407b4cba4f6027fac
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags