modify cputype
Merge branch 'master' of http://github.com/webconvforge/skia into HEAD