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

* commit 'f17f7217cd213f5c8356160bdfc2c804485c82c4':
  Camera: Fix incorrect pointer types