Merge tag 'android-4.3_r2.1' into HEAD

Android 4.3 release 2.1

Signed-off-by: Arnav Gupta <championswimmer@aokp.co>

Conflicts:
	res/values-cs/strings.xml
	res/values-ja/strings.xml
	res/values-ru/strings.xml
	res/xml/camera_preferences.xml
	src/com/android/camera/ActivityBase.java
	src/com/android/camera/CameraActivity.java
	src/com/android/camera/ComboPreferences.java
	src/com/android/camera/PanoramaModule.java
	src/com/android/camera/PhotoController.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/PreviewFrameLayout.java
	src/com/android/camera/RecordLocationPreference.java
	src/com/android/camera/Storage.java

Change-Id: I135530a2e76f843310947a0334f0a3b17ad6b377