am 1466b1aa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1466b1aad294138fc1e189c6fdce5eb7a2d06a42':
  Update msm_camera.h to version that supports instance handle based lookup