Merge stage-aosp-master into pi-dev-plus-aosp
am: f4eb173c45

Change-Id: I4587a9ac221f012769aad1a2c712237c88ddc40d
tree: fcc0349353273aa62f307117a83b9f1fdb7bbef0
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml