Merge "Undefine a bunch of helper function already exising in gcc 4.7."