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
Fix building for mako

The makefile assumes the lack of qcom make macros implies the mako,
which is incorrect in our case. Explicitly exclude the mako from
QCOM_BSP for now, as well as any device with TARGET_HAS_OLD_QCOM_BSP
set

Change-Id: I63e2d08f8c49c52e7cef8b7c1fd3e90b1b0307bd
Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	common.mk

Change-Id: I76711908eca381c773af6f3b82c026e8ab0e7041