Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I6aaa08a1895d8058f12872008da153af3d4feec6
tree: b8dd62e58891557e56577e6a808f6cbdb0518c09
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml