Merge "framework changes needed to support Skia at r12108."