Merge "Fix expected error message for wrong_arch"