GCC-4.8+ Build Fix

Change-Id: I7697eebc277dc08458529ac056a822132c4610e6

Conflicts:
	gki/Android.mk
	main/Android.mk