Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev