Merge "Switch libjnigraphics to sysv-only hash style"