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

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

Change-Id: Ib321cf244358fd9ef99c2eba86d9277cd29f14ad