Revert "surfaceflinger: Fix building with display-caf + QCOM_BSP"

This reverts commit d43b913921568332f4cac14af421221111571927.
Derp
Merge commit '7b3e701' into jbam10