Merge commit '8a550616' into msm-4.9 - PC 128

* commit '8a550616':
  msm: camera: icp: Reset timers if context is busy
  msm: camera: icp: Read the context acquire info with the lock
  msm: camera: core: Destroy the context handle on shutdown

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