Merge "Remove __INTRODUCED_IN_LLNDK uses." into main