Merging in some CM GalaxyS2 camera fixes:

galaxys2: camera: add missing picture size
camera: manage picture width and height separately

Fixes issue with "widescreen" pic sizes not working correctly

Change-Id: I3d5c1dd3360ca554dd447b94bf4c09280503d677