Merge "Remove RecordingCanvas's reliance on Skia's private SkTemplates.h"