Fix
Conflicts:
	libcorkscrew/Android.mk