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

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