Merge "msm: defconfig changes required by WLAN for msm7630." into msm-3.0