revert 8200 to figure out android break



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