Merge "Revert "Disable XOM in libjni_jpegstream."" am: a12f92690e am: 48e33926e8
am: ff32eaeaf0

Change-Id: If380f922f3b6bb1f0be0d53ab64036e267581627