Merge "Remove duplicate ELF_ST_TYPE() macro." into main