Merge changes I31f6896a,I97eac023,I8770c989 into msm-3.0

* changes:
  msm: camera: Add binning factor to sensor output info
  msm: camera: Set fps when camera is running
  msm: camera: Separate video timing and output pixel clk