Merge "Disable XOM in libjni_jpegutil." am: 8976366652 am: 959da569e0
am: 24fc7e20e4

Change-Id: I5fe950d12e19fc9e581a780b1dda42cb52dfc415