Merge "Check machine arch before detecting relocation type"