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

* commit '6590a92777da96268ca3ed30958fac7cb8ea35dc':
  Define LIKELY and UNLIKELY in a vendor friendly way

Change-Id: I56c6b834fa6646f37c7ca5618a74906a0445601e