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

Change-Id: Ia126e654f64ab8f73639e3a8abf6066b1d39c4df