galaxyS2: merging camera updates from CM

minus all the tabs ;)

http://review.cyanogenmod.org/#/c/32420/
http://review.cyanogenmod.org/#/c/32485/

Change-Id: Icdb8595e6ee979790a4318bb1c7e8f43c6f3a696