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

Android 4.3 release 2.1

Conflicts:
	bluetooth/bdroid_buildcfg.h
	full_toro.mk
	overlay/packages/apps/Phone/res/values/strings.xml
	recovery.fstab
	system.prop

Change-Id: I813bbe3b6a9ae101757e5771c551910e63259030
dependencies: Add android_device_sample to dependencies

This is required for toro's APN file

Change-Id: I20bf385588711320c22793e1a5fcb36bdfe87dc2