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

Bug: 134405016
Change-Id: I49179df371f8291a86cd2db26247696aee8f7ae4
tree: cc1ef2a177453173643bb0b46c909672ed169583
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk