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

Bug: 112535855
Change-Id: I63d41d36e73ee6ec9d8d3c4bae82997dbae6de49
tree: 3b22dfc8ae6cd9843b518ae65c218750bb94c230
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk