Revert "data-ipa-cfg-mgr: fix compilation issues due to kernel changes"

This reverts commit eb9f260cdade1bc33908b3fb30a5590e1dae9715.

Change-Id: I33c799851200f63cbb305bf8af190b1de7312831

ipacm/inc/IPACM_Defs.h

diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h
index 3096974..149c03a 100644
--- a/ipacm/inc/IPACM_Defs.h
+++ b/ipacm/inc/IPACM_Defs.h
@@ -40,7 +40,6 @@
 #ifndef IPA_CM_DEFS_H
 #define IPA_CM_DEFS_H
 
-#include <bits/in_addr.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <linux/msm_ipa.h>

ipacm/src/Android.mk

diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 8db1dca..4f00e8a 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -25,6 +25,9 @@
 LOCAL_C_INCLUDES += external/libnetfilter_conntrack/include
 LOCAL_C_INCLUDES += external/libnfnetlink/include
 
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_CFLAGS := -v
 LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID
 LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror -Wno-error=macro-redefined