Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master

Bug: 111615259
Change-Id: I75150ce020a03dc4881679a6d4f88b39dcfd7947
tree: ee9e11b23ccc14799bb69ee46edf58c994598cab
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml