Merge "Revert "make: flatten object file directories"" into experimental