Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I08fd68e3dafbc0a86faa05d120d4a6a3681106a2
diff --git a/Android.bp b/Android.bp
index 10f4ba2..da7804c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,8 +19,7 @@
     host_supported: true,
     hostdex: true,
     srcs: ["main/src/main/java/**/*.java"],
-    //  SDK 10 needed for ObjectStreamClass lookupAny
-    sdk_version: "10",
+    sdk_version: "core_current",
 }
 
 // Compatibility library for old name of host target