Merge "Fix build break for camera.v4l2_test" into main