Merge "Add '-unstable' to solve ODR violation"
diff --git a/services/incremental/Android.bp b/services/incremental/Android.bp
index 7534c7c..e978ed4 100644
--- a/services/incremental/Android.bp
+++ b/services/incremental/Android.bp
@@ -51,9 +51,9 @@
     static_libs: [
         "libbase",
         "libext2_uuid",
-        "libdataloader_aidl-cpp",
-        "libincremental_aidl-cpp",
-        "libincremental_manager_aidl-cpp",
+        "libdataloader_aidl-unstable-cpp",
+        "libincremental_aidl-unstable-cpp",
+        "libincremental_manager_aidl-unstable-cpp",
         "libprotobuf-cpp-lite",
         "service.incremental.proto",
         "libutils",