Revert of merge to m47 fix for not calling eviction when atlas evicts

Revert of merge to m47 fix for not calling eviction when atlas evicts (patchset #1 id:1 of https://codereview.chromium.org/1408763006/ )

Reason for revert:
reverting in case this is breaking the bots

Original issue's description:
> merge to m47 fix for not calling eviction when atlas evicts
> 
> BUG=551904
> NOTREECHECKS=true
> NOTRY=true
> NOPRESUBMIT=true
> 
> Committed: https://skia.googlesource.com/skia/+/dac527240dae4d0bce268639a13d89905164356a

TBR=robertphillips@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=551904
Committed: https://skia.googlesource.com/skia/+/b6589d8d5a088f5467e20a7d7cf3bb1976d2b176

[joshualitt, 2015-11-09 22:28:18]

Created Revert of merge to m47 fix for not calling eviction when atlas evicts

[commit-bot: I haz the power, 2015-11-09 22:28:22]

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

[commit-bot: I haz the power, 2015-11-09 22:28:31]

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

[bsalomon, 2015-11-09 23:54:02]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1418603004/ by bsalomon@google.com.

The reason for reverting is: tests are broken after revert so reverting the
revert.