Revert "delete old things!"

This reverts commit 15b125d40122e966bd723d23e82c3224b1da4898.

NOTREECHECKS=true

original change breaks android tree

BUG=skia:

Review URL: https://codereview.chromium.org/848073005
456 files changed