Merge "Remove references to full_classes_proguard_jar"