fix build

Conflicts:
	main/Android.mk

Change-Id: I294b8aeb548ba3a0d72dfb4d76a507ff645352b4