Merge "allow vendor init to set vendor_camera_prop" into udc-d1-dev