Backport from master.

Change-Id: I416e4325242ba147cb02acb69a577bf1fb60275f
diff --git a/Android.mk b/Android.mk
index 1914af7..0694aef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,9 +15,9 @@
 
 LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
 
-LOCAL_NO_EMMA_INSTRUMENT := true
+LOCAL_SDK_VERSION := 8
 
-include $(BUILD_JAVA_LIBRARY)
+include $(BUILD_STATIC_JAVA_LIBRARY)