Merge "mmc: msm_sdcc: Fix compilation issues"