Add original resources back and update code to match

https://codereview.appspot.com/6842061/



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