Merge "defconfig: msm7630: Add support for 1GB RAM" into msm-3.0