Merge "Treat SkFILEStream's fOriginalOffset as the start" into pi-dev
am: e173b1b28c

Change-Id: Ie333c6bafbe163730ff4edfa22c49c4673537167