Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"