Merge "Build: fix 'BL stage' comment for build macros" into integration