Merge 37d7d00b5d3c9149a2641424a87b7fe80c89b7c9 on remote branch

Change-Id: I7bea62bfbc13666e529ffced3e133b4458919892
diff --git a/Android.bp b/Android.bp
index 5ff3273..d8443e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,7 @@
     apex_available: [
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.extservices",
         "//apex_available:platform",
     ],
 }
diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp
index c52381f..5a552db 100644
--- a/tensorflow/lite/tflite_static.bp
+++ b/tensorflow/lite/tflite_static.bp
@@ -202,4 +202,9 @@
         "-Wno-visibility",
     ],
     stl: "libc++_static",
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.extservices",
+    ],
 }