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

Change-Id: Iae1726aad8fe70110f11e1c25c82c5d6a97bcfa1