Merge "Fix unbundled jack builds"