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

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