Merge "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"