sync with liquid

Conflicts:
	libc/Android.mk