Merge "msm8610: enable SSD support"