Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev am: b9790fd184
am: 2648615308

Change-Id: I3b31e298517327f2400d5e060fb09e79f393fc0f