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