fix build with gcc 4.7 toolchain

Change-Id: I224ca6b3f5e7746cc18534a2212e34731b5da466
Merge branch 'jbdev' of https://github.com/maddoggin/hardware_qcom_display into jbdev