Fixes to the Skia merge at revision 6890.

Change-Id: I4d660b49051add2407fbe4eb1dcbd2c661ad39ee
3 files changed