Revert of Muck with the right cinfo.

Revert of Muck with the right cinfo. (patchset #2 id:20001 of https://codereview.chromium.org/858333002/)

Reason for revert:
Appears to cause Android dm to segfault.

Original issue's description:
> Muck with the right cinfo.
> 
> In SkImageDecoder_libjpeg, modify cinfo *after* destroying it and
> creating a new one in its place.
> 
> Should fix build breakage.
> 
> Committed: https://skia.googlesource.com/skia/+/3629865bac20ae8092177f519594f79f89d09fb0

TBR=scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://skia.googlesource.com/skia/+/aa7079b4a19e6d53040c4fb5cd62f2dd39c2595e

[bungeman-skia, 2015-01-21 23:07:15]

Created Revert of Muck with the right cinfo.

[commit-bot: I haz the power, 2015-01-21 23:08:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/858323003/1

[commit-bot: I haz the power, 2015-01-21 23:08:13]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/aa7079b4a19e6d53040c4fb5cd62f2dd39c2595e

[bungeman-skia, 2015-01-21 23:11:27]

On 2015/01/21 23:08:13, I haz the power (commit-bot) wrote:
> Committed patchset #1 (id:1) as
> https://skia.googlesource.com/skia/+/aa7079b4a19e6d53040c4fb5cd62f2dd39c2595e

The Nexus 7 and 10 seemed ok (ran dm without issue), but S4, Nexus 5 and 9, and
Xoom all segfaulted.

[bungeman-skia, 2015-01-22 00:03:59]

On 2015/01/21 23:11:27, bungeman1 wrote:
> On 2015/01/21 23:08:13, I haz the power (commit-bot) wrote:
> > Committed patchset #1 (id:1) as
> >
https://skia.googlesource.com/skia/+/aa7079b4a19e6d53040c4fb5cd62f2dd39c2595e
> 
> The Nexus 7 and 10 seemed ok (ran dm without issue), but S4, Nexus 5 and 9,
and
> Xoom all segfaulted.

Interestingly, the S4 was previously segfaulting, and neither the original
change nor this revert seems to have really affected it. This revert did restore
dm to non-segfaulting on Nexus 5, 9, Player, and Xoom.