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

Change-Id: I14a70513d71d672203ed59aa8998317333ce736e