diff --git a/support.bp b/support.bp
index d16bdbd..0732053 100644
--- a/support.bp
+++ b/support.bp
@@ -180,8 +180,6 @@
         "-DRS_COMPATIBILITY_LIB",
 
         "-DGEMMLOWP_USE_STLPORT",
-        // TODO: why isn't this picked up from the host GLOBAL_CFLAGS?
-        "-D__STDC_FORMAT_MACROS",
 
         // Allow implicit fallthrough in rsContext.cpp:414 until it is fixed.
         "-Wno-error=implicit-fallthrough",
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
index 2577d05..fb337e0 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
@@ -21,9 +21,10 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
+import androidx.test.filters.MediumTest;
+
 import com.android.rs.imagejb.IPTestListJB.TestName;
 
 import java.io.BufferedWriter;
diff --git a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
index e12aca4..e4deb89 100644
--- a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
+++ b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
@@ -20,9 +20,10 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
+import androidx.test.filters.MediumTest;
+
 import com.example.android.rs.blasbenchmark.BlasTestList.TestName;
 
 /**