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
display: Fix handling of QCOM_BSP

 * Only set this CFLAG if the device declares TARGET_USES_QCOM_BSP.

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

Conflicts:
	common.mk

Change-Id: I44edb63e07128bdf7187c4274a89675649c50bf7