Snap for 8564071 from 0d50800dbf90a18f6db29d9a2cd949fd042072b1 to mainline-cellbroadcast-release

Change-Id: I7cc9503d0c6581b1b878cec37dea5a217d8bc5ec
diff --git a/XMPCore/Android.bp b/XMPCore/Android.bp
index dab0455..4a6bc57 100644
--- a/XMPCore/Android.bp
+++ b/XMPCore/Android.bp
@@ -19,5 +19,5 @@
     name: "xmp_toolkit",
     // Include all the java files.
     srcs: ["src/**/*.java"],
-    sdk_version: "8",
+    sdk_version: "current",
 }