Merge "Revert "Disable XOM in libjni_jpegutil.""
am: fbbd978b24

Change-Id: I1770b830a1d99a22289dbba692a3454f37a3d735