Revert "Makefile and Kbuild changes to make it build in CyanogenMod tree"

This reverts commit 918f90ae2f8c25dcfd8615e5de8f3fbe7bc6b7f5.