Merge "qup_i2c: turn off the ahb clock conditionally" into msm-3.4