Merge "Added proguard 5.2.1"