reland 8897 (was not a build-breaker) and fix MathTest (was a build-breaker)



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