Add new tests to presubmit, fix errors

BUG=skia:3189
R=jcgregorio@google.com,rmistry@google.com

Review URL: https://codereview.chromium.org/777413002