am 792f3b2e: am 09effe38: Merge "Move CameraParameters header to join rest of camera library." into jb-dev

* commit '792f3b2e9ef31876567a1e28ab5d2d9af514e4a0':
  Move CameraParameters header to join rest of camera library.