Fix liblog build

Conflicts:
	liblog/Android.mk