Merge "Revert "msm: camera: Control vpe_axi_clk in camera driver"" into msm-3.0