Merge "mmc: core: fix the decision of HS200/DDR card-type" into msm-3.4