Merge "libcamera_client: 64-bit compile issue"