Merge "Remove use of Skia-internal SkHalf.h"