am 9562d38d: Merge "Clean up __builtin_expect usage."

* commit '9562d38df1e4aba941b3433cfd0922fee5ea258b':
  Clean up __builtin_expect usage.