Fix build error with 4.8+ toolchains
Merge branch 'cm-11.0' of github.com:xsynergy510x/android_hardware_qcom_display-caf into cm-11.0

Syncing with CM upstream