am b6bee6f1: am 3e467785: Remove irritating warnings about \'va_list\' mangling when building C++ sources.

Merge commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21'

* commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21':
  Remove irritating warnings about 'va_list' mangling when building C++ sources.