Merge "Fix dependencies when not building with Jack."