Merge "defconfig: 9615: Enable MMC/SD/SDIO" into msm-3.0