am ad39eb0a: Merge change 5302 into donut

Merge commit 'ad39eb0a2555762a1d9157f8017097579d14f39d'

* commit 'ad39eb0a2555762a1d9157f8017097579d14f39d':
  Add includes to enable host C++ tools to compile with GCC 4.4