Merge "Skia API changes as a result of an update to the Skia library."