Fix compilation of hwcomposer

Change-Id: I448e35f243da1f6f89d0a7328343d122b738ebe9

Conflicts:
	libgralloc/alloc_controller.cpp