camera: manage picture width and height separately

required for 3264x2448 <-> 3264x1968

Change-Id: I729402e208dccee8cf1d1368c1d2d0dcd1f08a3d
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD