Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	res/values-nl/uploader.xml

Change-Id: Icf80046aeeb242b17e6c556022c4ac030843230e