Merge "fix(arm_fgpa): allow build after MAKE_* changes" into integration