Merge "Remove use of private SkBlurMask.h"