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

* commit 'cb4d650a79d49f19e9271f843c1eaf4382337704':
  Camera2: Factor out Camera2Client::Parameters