Merge "Revert "Disable XOM in libjni_jpegutil.""