Merge "There's now just one <sys/system_properties.h>." into main