Merge "Use [u]int32_t instead of __[u]int32_t in sys/types.h"