Fix

Change-Id: Ic9af944a758b3f3b9e5e89dc40564ee3aaa3d18c

Conflicts:
	libgralloc/Android.mk