Merge "defconfig: msm: Enable SPI config"