Partial revert of r9812 & put rest of r9812 behind a compile flag

https://codereview.chromium.org/18317003/



git-svn-id: http://skia.googlecode.com/svn/trunk@9832 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed