Merge "make: Fix parallel builds"