am 3ba9dcb1: Merge "Camera: Fix incorrect pointer types" into jb-mr2-dev

* commit '3ba9dcb180ac8e01c513b1790cd0cad0f46b887f':
  Camera: Fix incorrect pointer types