Fix linux-clang with clang 3.4

Cherry-picked upstream r153965 to fix linux build with clang 3.4

Change-Id: Ib3eeb5c424c4f0ef00c228ad02b61ef87dd9b3b6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>