Fix issues encountered in google3 roll (again).

NO_G3_REWRITE strikes again.

Change-Id: I3c1bad484e823176db07de881422739695044b26
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/774820
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
1 file changed