Merge "soc: qcom: remove unused header files" into msm-4.8