diff --git a/.gitupstream b/.gitupstream
new file mode 100644
index 0000000..0615e7b
--- /dev/null
+++ b/.gitupstream
@@ -0,0 +1 @@
+https://git.codelinaro.org/clo/la/platform/vendor/opensource/dataipa
diff --git a/drivers/platform/msm/Android.bp b/drivers/platform/msm/Androidbp
similarity index 100%
rename from drivers/platform/msm/Android.bp
rename to drivers/platform/msm/Androidbp
diff --git a/drivers/platform/msm/Android.mk b/drivers/platform/msm/Androidmk
similarity index 100%
rename from drivers/platform/msm/Android.mk
rename to drivers/platform/msm/Androidmk
diff --git a/ipanat/Android.bp b/ipanat/Android.bp
index 0bcf3a0..4dfba93 100644
--- a/ipanat/Android.bp
+++ b/ipanat/Android.bp
@@ -22,8 +22,7 @@
     ],
     export_include_dirs: ["inc"],
     vendor: true,
-    clang: true,
 
-    cflags: ["-DDEBUG"] + ["-DFEATURE_IPA_ANDROID"] + ["-Wno-int-conversion"],
+    cflags: ["-DDEBUG"] + ["-DFEATURE_IPA_ANDROID"] + ["-Wno-int-conversion", "-Wno-unused-parameter", "-Wno-incompatible-pointer-types", "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-format"],
 
 }
diff --git a/kernel-tests/Android.bp b/kernel-tests/Androidbp
similarity index 100%
rename from kernel-tests/Android.bp
rename to kernel-tests/Androidbp