Make canonicalize() hidden to avoid conflict with libm.
am: 8f6f827b45

Change-Id: I09f805fe673946ff0e72c2474914e48269b49da9