Merge commit '83ad0691' into msm-4.9 - PC 131

* commit '83ad0691':
  msm: camera: isp: Enable the CSID crop
  msm: camera: csiphy: Reset device count on shutdown
  msm: camera: isp: State monitoring in isp for error logging
  msm: camera: isp: CSID global reset with software registers
  msm: camera: isp: Stop ife hw mgr tasklet after ife resource stop
  msm: camera: enables BPS callback for CPAS
  msm: camera: Code cleanup across KMD drivers
  msm: camera: isp: Add reset to deinit sequence

Change-Id: I7e03bffa446a369c8dfa48006b433ddcf4ff66cb
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>