Merge "Fix SkFILEStream." into nyc-dev