Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 86eb4b9266

Change-Id: Icc7d0ce1fc6f761fe732ae3fc5d5bd96518f5ba1
tree: 370072986bf76f0d9cb75c973b87f251d8fe2644
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml