Merge "refactor(build): merge march32/64 directives" into integration