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

Change-Id: Ib45bd50cf941ec9559cda7cb59ac4f61866ad561