surfaceflinger: Add more ifdefs for secure display query

Commit f04661 forgot ifdefs in HWComposer.h that break ABI. This
broke at least grouper and endeavoru surfaceflinger.

Change-Id: I9a1bd4e1fb9a2ad5ac0a39e86ef8131b52526e32
surfaceflinger: Fix QCOM_BSP ifdef

Change-Id: Ie6bdb81385762a0b3b25e207bc4add3cdcf1e6fe
Revert "native: Fix QCOM_BSP_LEGACY cflags"

* This is unnecessary now that the flags are set in the build makefile

This reverts commit 7c38f6bf2fd19214146788f5b5b8cd587fa972fb.

Change-Id: I5c1042b762f84455c888bafe56c5a619952bfbba
frameworks/native: Remove unnecessary QCOM_BSP defines

* This is already provided by the build makefiles

Change-Id: I630f09850f6f66c8f3c501fa5fd78f5a15a3436f
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_native into cm-12.0