Back to last AndroidKernel.mk implementation