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

Change-Id: Ide70e11180d8a3b2ada54cfc57e9c5d9f1b187ab