Update Makefile & AndroidKernel.mk