[Bug 225630] New: Merge Review: buildsys-macros