Revert "Camera: ISO C++11 build fixes"

This reverts commit 872dd83a97e2dbb9df1e41aa6116c55852f25bdc.