Merge "Updates resulting from the Skia merge (revision 1327)"