Fix building for msm8960

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

Squashed commit from:
1. https://gerrit.slimroms.net/#/c/16460/1
2. https://gerrit.slimroms.net/#/c/16462/

Change-Id: Ic36795883cbd8a09288f3a060e99ddb55ec8326e
display: build barrier for DISPLAY_VARIANT

Change-Id: Ie1d91150e1530b7f46bfb945083248f4f47e72ed