Merge "Disable XOM in libjni_jpegutil."
am: 8976366652

Change-Id: Id12b00c639d83e039ad9b07d95285139e2457b88