Workaround for gcc 4.8

Conflicts:
	Android.mk