Revert of remvoe duplicate impl for SkImageInfo flattening

Revert of https://codereview.chromium.org/108773003/
Reason for revert: breaks chrome-mac-tests

TBR=
NOTREECHECKS=true
NOTRY=true

Committed: http://code.google.com/p/skia/source/detail?r=12629

[commit-bot: I haz the power, 2013-12-11 20:55:19]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/reed@google.com/113193003/1

[reed1, 2013-12-11 20:55:40]

Created Revert of remvoe duplicate impl for SkImageInfo flattening

[commit-bot: I haz the power, 2013-12-11 20:55:52]

Change committed as 12629

[rmistry, 2013-12-11 21:07:30]

A revert of this CL has been created in
https://codereview.chromium.org/113233002/ by rmistry@google.com.

The reason for reverting is: The wrong CL was reverted accidently.