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

* commit '16d40217d05a1d9ad8ec475ce5f68c35bbef7029':
  Fix the clang build: this compiler doesn't support the gnu_inline function attribute