Merge "Fix build on Linux due to different strrchr prototype."