diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9515b25
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,2 @@
+soong_namespace {
+}
diff --git a/hal/Android.bp b/hal/Android.bp
index 14d3745..f7aa0b1 100644
--- a/hal/Android.bp
+++ b/hal/Android.bp
@@ -12,7 +12,6 @@
     shared_libs: [
         "libhidlbase",
         "liblog",
-        "libcutils",
         "libdl",
         "libbase",
         "libutils",
diff --git a/hal/src/CtUpdateAmbassador.cpp b/hal/src/CtUpdateAmbassador.cpp
index eba6b93..b5e60e2 100644
--- a/hal/src/CtUpdateAmbassador.cpp
+++ b/hal/src/CtUpdateAmbassador.cpp
@@ -33,7 +33,7 @@
 
 /* External Includes */
 #include <arpa/inet.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 /* HIDL Includes */
 #include <android/hardware/tetheroffload/control/1.0/ITetheringOffloadCallback.h>
diff --git a/hal/src/HAL.cpp b/hal/src/HAL.cpp
index f18767a..6c1ec10 100644
--- a/hal/src/HAL.cpp
+++ b/hal/src/HAL.cpp
@@ -39,7 +39,7 @@
 #include <linux/netfilter/nfnetlink_compat.h>
 
 /* External Includes */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cstring>
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/hal/src/IpaEventRelay.cpp b/hal/src/IpaEventRelay.cpp
index 137092f..484355a 100644
--- a/hal/src/IpaEventRelay.cpp
+++ b/hal/src/IpaEventRelay.cpp
@@ -28,7 +28,7 @@
  */
 #define LOG_TAG "IPAHALService/IpaEventRelay"
 /* External Includes */
-#include <cutils/log.h>
+#include <log/log.h>
 
 /* HIDL Includes */
 #include <android/hardware/tetheroffload/control/1.0/ITetheringOffloadCallback.h>
diff --git a/hal/src/LocalLogBuffer.cpp b/hal/src/LocalLogBuffer.cpp
index f556e40..50fa91c 100644
--- a/hal/src/LocalLogBuffer.cpp
+++ b/hal/src/LocalLogBuffer.cpp
@@ -29,7 +29,7 @@
 #define LOG_TAG "IPAHALService/dump"
 
 /* External Includes */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <deque>
 #include <string>
 #include <sys/types.h>
diff --git a/ipacm/Android.bp b/ipacm/Android.bp
index 0ce21f7..eb03000 100644
--- a/ipacm/Android.bp
+++ b/ipacm/Android.bp
@@ -3,9 +3,9 @@
     name: "ipacm",
 
     local_include_dirs: ["src"] + ["inc"],
-	header_libs: ["qti_kernel_headers"],
+	header_libs: ["generated_kernel_headers"],
 
-    cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
+    cflags: ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
         "-DFEATURE_IPACM_HAL",
 	"-DDEBUG",
         "-Wall",
diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 9bcbac4..a0f8777 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -6632,7 +6632,7 @@
 		&flt_eq.eq_attrib, sizeof(rule->eq_attrib));
 
 	//add IHL offsets
-	if(IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_v3_0)
+	if (IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_v3_0)
 		rule->eq_attrib.rule_eq_bitmap |= (1<<10);
 	else
 		rule->eq_attrib.rule_eq_bitmap |= (1<<4);
diff --git a/ipacm/src/ipacm.rc b/ipacm/src/ipacm.rc
index 6b3bf98..8a63b46 100644
--- a/ipacm/src/ipacm.rc
+++ b/ipacm/src/ipacm.rc
@@ -25,10 +25,12 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# msm specific files that need to be created on /data
+on post-fs-data
+    mkdir /data/vendor/ipa 0770 radio radio
+    chmod 0770 /data/vendor/ipa
+
 service vendor.ipacm /system/vendor/bin/ipacm
-    class main
+    class late_start
     user radio
     group radio inet
-
-on post-fs-data
-    start vendor.ipacm
diff --git a/ipanat/Android.bp b/ipanat/Android.bp
index 310304d..3c8f977 100644
--- a/ipanat/Android.bp
+++ b/ipanat/Android.bp
@@ -3,7 +3,7 @@
 cc_library_shared {
     name: "libipanat",
 
-    header_libs: ["qti_kernel_headers"],
+    header_libs: ["generated_kernel_headers"],
 
     srcs: [
         "src/ipa_nat_drv.c",
diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index b8ae6a4..a6bb4b0 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -10,8 +10,7 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ipanat/inc
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_MODULE := ipa_nat_test
 LOCAL_SRC_FILES := ipa_nat_test000.c \
@@ -42,7 +41,7 @@
 
 LOCAL_SHARED_LIBRARIES := libipanat
 
-LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/kernel-tests/ip_accelerator
 
 include $(BUILD_EXECUTABLE)