Merge "msm_shared: mmc: Change structure names for mmc device"