Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev