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

Android 4.3 release 2.2

Conflicts:
	bluetooth/bdroid_buildcfg.h
	full_toroplus.mk
	overlay/packages/apps/Settings/res/values/config.xml
	recovery.fstab