Merge "defconfig: 9615: Enable SPS for MMC" into msm-3.0