Merge "Remove usage of SK_MaxS32"