DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: a432ea9ded

Change-Id: Ic0636201c148af9b7f1ee4a5b76ff4196fa0fff6
tree: 499e089d193efa50f8b4c11d7cdd723c26c680a8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg