galaxys2: volume rocker wake

Change-Id: I8ebb0c76e0a96caa0b9f8d959cc2718c7bfd833c
galaxys2: camera: add missing picture size

Change-Id: I2b7d06f42a6020bc8bbe6718bedbd74ebe706636
camera: manage picture width and height separately

required for 3264x2448 <-> 3264x1968

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