[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: fbfcdaf2a5 -s ours
am: 275b056832 -s ours
am skip reason: change_id I67a7040a90c369abf5a0c3e7cf0e16f351addb99 with SHA1 874516b3a8 is in history

Change-Id: Ic750a648952125ba32ce669bfbbd30ade953d1b2
tree: 6a561f5379c73c4eb7ba64915284437755028320
  1. apps/
  2. build/
  3. util/
  4. .gitignore
  5. README