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

Change-Id: Id45cd9a2b80edbda8659348058c04f7fa56e9d88
tree: 2ca63a07662d88913d3b4a3f940b52005119c289
  1. PMC/
  2. sl4n/
  3. UID/
  4. OWNERS
  5. PREUPLOAD.cfg