Merge tag 'android-4.3_r2' of https://android.googlesource.com/device/samsung/manta into cm- 10.2

Android 4.3 release 2

Change-Id: Ib5eb52950d6b3ae5581cc58d0a04e0b4d3686854

Conflicts:
	AndroidProducts.mk
	BoardConfig.mk
	kernel
	proprietary-blobs.txt
	recovery.fstab