Merge "Changes needed to support Skia at r10377."