Squash 4.3 changes.

Conflicts:
	res/values-ar/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-lt/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-sl/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/xml/camera_preferences.xml
	src/com/android/camera/CameraActivity.java
	src/com/android/camera/CameraScreenNail.java
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/ComboPreferences.java
	src/com/android/camera/PhotoController.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/RecordLocationPreference.java
	src/com/android/camera/VideoModule.java
	src/com/android/camera/ui/MoreSettingPopup.java

Change-Id: I3d19698d96f324c8d01505a640aa8757425aaee8