am e804aa48: Merge "Move CameraParameters header to join rest of camera library." into jb-dev

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