Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-dev