Merge "mmc: msm_sdcc: Fix compilation error" into msm-3.0