Merge "Fix ambiguity in negate()s." into master-skia

https://skia.googlesource.com/skia/+/b502ee3acea9bca87ab75de808b4a7eda67aadff

Change-Id: Iff3af06fcd26de31061517710e7e6a2ce744c75f