Revert part of r7047 to check Xoom failures

https://codereview.appspot.com/7070049/



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