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

* commit 'd2acf124ed7ad18f8adb5159544c92234cade90e':
  Clean up __builtin_expect usage.