Camera: separate settings for color effects and jpeg quality

Store color effect and jpeg quality settings for the camera and
video camera in their own separate preferences.

Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
camera: add support for 6.4 and 2.5MP (16:9) picture sizes

Change-Id: I275477da95c9450e69c839b89ff5ab806bf1c3cf
camera: add support for 2.1, 9 and 13MP picture sizes

Change-Id: Ic0b174e7e2be8e12c9fa694c93d8cedd1ee7d576
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1

Conflicts:
	res/xml/video_preferences.xml
	src/com/android/camera/VideoController.java

Change-Id: I008d606618f0016ef453ddb56dfe334ef35ae086