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

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