Merge "Add lint check for "old" proguard configurations with generic Android config"