Redo clang patch in a way that doesn't break gcc 4.8

Change-Id: I6b0ed3cf05b552c982f851d161c5bcb7f1cd5930
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>