Merge "Define LIKELY and UNLIKELY in a vendor friendly way"
am: 7ed5194

* commit '7ed5194278dd9ffcda203dd3a8250c0cb2914d07':
  Define LIKELY and UNLIKELY in a vendor friendly way

Change-Id: Ie782284f30e731b6ee26b99c39e532b27210eaec