Merge "msm: defconfig: enable smd on 8064" into msm-3.0