Merge "camera: do not use GNU old-style field designators"