Fix upgrade to latest proguard

Change-Id: If42b65c2d2dd1dbbebd2b137866537cf18e16810