Merge "Fix SkFILEStream." into nyc-dev
am: 3d8955c7c9

Change-Id: I64659cde8afb40dead7b7c09787df1ddef7697b6