Merge "Revert "msm_shared: Fix the delays in the mmc driver.""