am f11c52d2: Updates resulting from the Skia merge (revision 1327)

* commit 'f11c52d246d9e43c8533dff82979e7eeb72c1d50':
  Updates resulting from the Skia merge (revision 1327)