This reverts commit 11b6adfe. Reason for revert: libjpeg-turbo has been updated with XOM compatibility. Change-Id: Ib23dd855eab1ad775770c4d0a0f12efd70abfd16