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

Change-Id: I38dc60ec72c6e9ac1cf98f68e700d7c95c714b69