Merge "Disable XOM in libjni_jpegstream." am: e768dafffd
am: a2aac739f2

Change-Id: I48ce974b89f8a77cec17c715fc8e7294872b06cd