libgui: Fix building with QCOM_BSP + CAF display

Change-Id: Iaf0eb69fa7f409144a266ada683fceb835f62aff

Conflicts:
	libs/gui/Android.mk
Merge "libgui: Fix building with QCOM_BSP + CAF display" into jb4.3