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

Android 4.3 release 2.1

Conflicts:
	BoardConfig.mk
	init.tuna.rc
	recovery.fstab

Change-Id: I622650b19a49679badea37a0e4beb7da29dd3671