Merge "defconfig: msm8226: Enable SCSI support"