am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"

* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp