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

Change-Id: Ib7b3ace2af4a108b650f391120b97d768fa30fa1