Merge "defconfig: remove msm7630 defconfigs"