Merge branch 'clk-qcom-8996-halt' into clk-next