Merge "Make canonicalize() hidden to avoid conflict with libm."