Snap for 6577144 from 46134024772ac2269b0b3074322f0e66f0cdc65d to r-keystone-qcom-release

Change-Id: I947bfb20c45914b9eaa3aa40b1d9acef5a16181f
diff --git a/Android.bp b/Android.bp
index 73fb565..2fd02f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,11 +37,6 @@
     certificate: ":com.android.sdkext.certificate",
 }
 
-sdk {
-    name: "sdkextensions-sdk",
-    java_sdk_libs: [ "framework-sdkextensions" ],
-}
-
 apex_key {
     name: "com.android.sdkext.key",
     public_key: "com.android.sdkext.avbpubkey",
diff --git a/testing/Android.bp b/testing/Android.bp
index 3042a58..bc31322 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -61,6 +61,7 @@
     name: "test_framework-sdkextensions",
     jars: ["test_framework-sdkextensions.jar"],
     stem: "framework-sdkextensions",
+    apex_available: ["test_com.android.sdkext"],
 }
 
 // It isn't currently possible to build this from source because of limitations