Merge "Add missing libjpeg in linker option.  Currently this library is used by the main executable but is included implicitly via inter-library dependency."