Merge "Disable XOM in libjni_jpegstream."
am: e768dafffd

Change-Id: I46b9b51ebf1d3e267cc51176780f92049d36e229