Merge "Revert "Skip inttypes.h on Darwin""