Import:  libjpeg 9a
Merge branch 'upstream' into CoApp