Makefile and Kbuild changes to make it build in AOKP tree

Change-Id: I2d3f98314d53389a3b5156ca8cc62a23f5fb8406