Merge "defconfig: msm9625: Enable additional config options"