Merge "Update to use the correct jpeg lib" into rvc-dev