Merge "Move proguard before classes.jar" am: 41d5cd7420 am: c40073c77f am: 6ade789f59
am: 1ed4235172  -s ours

Change-Id: If02247470203e422546ead3786e401253330846e