Merge "Preserve line number information in Proguard config"