'Merge tag 'android-4.3_r2.1'
Android 4.3 release 2.1

Conflicts:
	res/values-el/uploader.xml
	res/values-nl/uploader.xml