Merge "defconfig: remove CONFIG_MMC_MSM_CARD_HW_DETECTION" into msm-3.4