Reverting 9083 & 9084 due to Android failures



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