Merge "Frameworks changes to support latest Skia (r14729)"