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

Android 4.3 release 2.1

Conflicts:
	Android.mk
	libgralloc/alloc_controller.cpp
	libgralloc/gpu.h

Change-Id: Ia7b060bf83fb16c5693259a5c0e2e0073b042ff8