Fix and enable proguard on packages.
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 8598e7e..a2acb01 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -351,7 +351,8 @@
   link_instr_intermediates_dir.COMMON := $(call intermediates-dir-for, \
       APPS,$(LOCAL_INSTRUMENTATION_FOR),,COMMON)
 
-  full_java_libs += $(link_instr_intermediates_dir.COMMON)/classes.jar
+  # link against the jar with full original names (before proguard processing).
+  full_java_libs += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
 
   # We can't depend on the .jar file, so we depend on something that
   # depends on the jar file; the final built package file.