Merge "Don't add Jack dependencies when building without Jack"