am a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"

* commit 'a8719ad9d53d3fe51e8031b2471e9558b8ef727f':
  Use the standard CC_LIKELY and CC_UNLIKELY macros