Merge "mmc: block: workaround for timeout issue with some vendor devices" into msm-4.9