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

Change-Id: Ib5f1c19f090ca44faedbebd3ee0f6060918bd1f6