Merge "Add missing proguard rule for ECCurve$Fp" into main