Merge "Move proguard before classes.jar" am: 41d5cd7420
am: c40073c77f

Change-Id: Ib60ca56f292d105bbd873422915d9640463610df