TBR=bungeman Review URL: https://codereview.appspot.com/6893043 git-svn-id: http://skia.googlecode.com/svn/trunk@6684 2bbb7eff-a529-9590-31e7-b0007b416f81
https://codereview.appspot.com/6850115/ git-svn-id: http://skia.googlecode.com/svn/trunk@6681 2bbb7eff-a529-9590-31e7-b0007b416f81