kbuild: Fix merge conflict in Makefile file properly

'commit 3ba3c6ce ("Merge remote-tracking branch
'remotes/origin/tmp-df0daba8' into msm-4.14")'
merge conflict resolution was not proper and causing
compile time issues. Resolved merge conflict and necessary
clean up to the Makefile.

Change-Id: Idb0cb690fb5c940006cd565b358dc92aa5f2648a
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>