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

This reverts commit 27a41c29f6221c145da608cd2f6cb2bd9280d00a.