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