Fix build issues with older gcc versions.

We were running into build issues on BG/P.

Change-Id: Id61c37f2cb8529822d5ed6366775d3e1e63151f0
Merge topic 'bgp_xlc_fixes' into next

bbbdb82 Fix build issues with older gcc versions.