Merge "[build] Fix strict prototype warning with latest Clang."