Merge "switch to unique_ptr version of Skia stream api"