Merge "Arm: Fix error message printing in board makefile" into integration