libgui: Fix building with QCOM_BSP + CAF display

Change-Id: Iaf0eb69fa7f409144a266ada683fceb835f62aff
add file test
Merge branch 'cm-10.2' of https://github.com/sembre/android_frameworks_native into cm-10.2