Merge "Revert "soc: qcom: Use a deferrable timer base for the msm watchdog""