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

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