Merge "Remove use of SkMathPriv.h"