Merge "Camera: remove stream_configuration_counter from camera3.h"