Revert "Update kernel.mk"

This reverts commit aaf686eb2a6edcdfe1678a57be2c94617ab2c630.
Revert "Update envsetup.sh"

This reverts commit 3b7886e190dfe31631df57905a113ad69c4a6556.