Merge "Switch libjnigraphics.so to hash-style=both"