Fixed the bugs that crashed the build bots

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