am c1d5ffe3: (-s ours) Merge "Undefine a bunch of helper function already exising in gcc 4.7."

* commit 'c1d5ffe349b9dc8d19e1cf2bff3f9c050e8cb93e':
  Undefine a bunch of helper function already exising in gcc 4.7.