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

Change-Id: I52d11954eba3ae8134b053ec09f303478590399e