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

Android 4.3 release 2.1

Conflicts:
	Android.mk

Change-Id: I009c0d62b1f6b7da50e1baa2a92beb73849b8541
Revert "VeNum optimizations"

This reverts commit fc31bb5c03957dc66b5fe104dd88cc2dcecc3466.
Generating "warning: shared library text segment is not shareable",
review later

Change-Id: I64a7de895ca03faf5ad34082cb56063776f25d83