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

Bug: 112535855
Change-Id: I55c6a4bf11f70e734f522eb5915d8466f00dedf8
tree: 777342afeaf7b68152f996fc9c5a8f5d7dec010e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml