Add libjpeg-turbo build config
Merge cleanup