Merge "defconfig: msm: Continued Config cleanup on SDM439"