Merge "Fixed a wrong AIDL import path" am: aa038e2f4d am: b35ead2c3a am: 3c78c789d6

Change-Id: Ifccc45bfaf67cc31f12902f56bcc50da238f8901
diff --git a/Android.bp b/Android.bp
index b84cc5f..1646c42 100644
--- a/Android.bp
+++ b/Android.bp
@@ -84,7 +84,7 @@
         local_include_dirs: ["binder"],
         include_dirs: [
             "frameworks/native/aidl/binder",
-            "frameworks/base/core/java/android/os/incremental",
+            "frameworks/base/core/java",
         ],
         export_aidl_headers: true,
     },