DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: bab9819b21

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