Merge "mmc: sdhci-msm: add nonhotplug support" into msm-4.9