Fix makefiles and update .gitignore

Conflicts:
	AndroidKernel.mk

Conflicts:

	AndroidKernel.mk