Reland r3078 (original failures that led to revert were problems with the bot)




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