More libcorkscrew fixes for GCC 4.8+

Conflicts:
	libcorkscrew/Android.mk