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

Change-Id: Ieb5c62a9f929878dfc0295f4aa2b2155e1fdb85e
tree: 74663c9b873bf045eeca9bef759d35345e1cd383
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS