Merge "fix(build): sp_layout gen for concurrent builds"