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

This reverts commit fe98b861cff84f9502f91d27318b4b812de9d14d.