Revert "Fixed clang build error for libgui"

This breaks HTC and Sony MSM8960 hwcomposer and surfaceflinger.

Possible that more QCOM devices are broken - at least that's the way it looks on get.cm and Jenkins

This reverts commit 07cc02d5f8efb3d3e51b8215bb5ab5e4353460af.

Change-Id: If0812df57a060999ac8c5f4ba12f2c23199afbc4