am 8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""

* commit '8173d76740cafc2ceb49d2fddf1ceabfaa823236':
  Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"