fix build with linaro

Conflicts:
	main/Android.mk

Change-Id: I38588b5ef2e81b01455d236597cb95365c122eb0