[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 126e1abf55
am: 60412fbb38 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia3eacad31290d25dec2eb2c4dc37fcd6fba4298b
tree: a267001c1eb90dc3c8451c1b8353f469bb678b5c
  1. src/
  2. Android.bp
  3. CleanSpec.mk