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

Change-Id: I9f693b256eff33fdf3d8614c3eb35e4c2d9e107f
tree: c42a90aacfe1c07af564ada7ea03e559767ab543
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags