Merge "Use SkFILEStream directly when possible" into nyc-dev