Merge "spi: spi-geni-qcom: Include the required headers explicitly" into msm-4.9