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

Change-Id: Ie069ac927354e0b97f51a2bd0c8406705769d86f
tree: effc13d50db0c020d2659313accb2a5693d25115
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg