Merge "mmc: sdhci: Fix timeout mdelay bug in sdhci_reset" into msm-4.9