Merge "Define LIKELY and UNLIKELY in a vendor friendly way"