Merge "msm: watchdog: remove broken msm_watchdog_remove function" into msm-3.0