Merge "Fix link error due to vehicle_camera_config_flag"