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

Change-Id: I98126498b83673f045a568926e1a4d9eec9c24b9