Merge "msm9625_defconfig: Enable watchdog" into msm-3.4