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

Change-Id: I4e7d97a7c2a75aa5ad439fcc68f07c159931c0b8
tree: d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
  1. library/
  2. tools/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg