diff --git a/org.ifaa.android.manager/Android.bp b/org.ifaa.android.manager/Android.bp
index d3298c48..305e9786 100644
--- a/org.ifaa.android.manager/Android.bp
+++ b/org.ifaa.android.manager/Android.bp
@@ -24,5 +24,6 @@ java_library {
     aidl: {
         local_include_dirs: ["src"],
     },
+    libs: [ "unsupportedappusage" ],
 }
 
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java
index d9a2f6ee..d40c9401 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.SystemProperties;
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
index a948fd23..36978741 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 
 public class IFAAManagerFactory {
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
index 7a62da17..d634ef0d 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 
 public abstract class IFAAManagerV2 extends IFAAManager {
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
index a33d3d9b..328fd75b 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 
 public abstract class IFAAManagerV3 extends IFAAManagerV2 {
     @UnsupportedAppUsage
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java
index 602f05b9..737e1c23 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 
 public abstract class IFAAManagerV4 extends IFAAManagerV3 {
     @UnsupportedAppUsage