Merge "Add missing arm-eabi-* in the error message."