Merge "Remove references to full_classes_proguard_jar" am: 6dfabc4353
am: 4a852ecdd6

Change-Id: I1034eeb63a9cb78cd44c88367cce67a59fab61bc