Snap for 4611397 from d857a064e37a24ca1574a39cab2ca644f8b82f5c to pi-release

Change-Id: I89dac9a2df141762c1c02de7ae6363c5b51ee6df
diff --git a/Android.bp b/Android.bp
index 83801dd..5bc72c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,7 +38,7 @@
 
     jarjar_rules: "jarjar-rules.txt",
 
-    no_framework_libs: true,
+    sdk_version: "core_current",
     java_version: "1.7",
 }