Merge "Revert "msm8974: Enable watchdog on msm8974"" into msm-3.4