Merge commit '74eeb58db32e66236411bede6af729d2ca1ecb45' * commit '74eeb58db32e66236411bede6af729d2ca1ecb45': Update reflects changes in type names in msm_camera.h.