DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: c8faaf1c4f

Change-Id: Id89091f33f531a045414ff1f9142bc3325a52855
tree: f236397a50d20d601689e1911d42b0d43c5ef5fe
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk