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

Bug: 112535855
Change-Id: Ic6da17c971f2a62af6c5974a48024e4c7f4a1ff0
tree: 94111e92314393e40282e6919df9e6a33d991439
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml