Adjusted camera parameters backported from ICS

Change-Id: I976bc539ed1b856a120ffcac6ca742c1bef15280

Conflicts:

	include/camera/CameraParameters.h