Merge "vendor: Allow providing camera server and service" into q10