Merge "Upgrade bundled Proguard to version 4.7"