am 12e519cc: (-s ours) am 5e2e4fd5: am e2cda953: Merge "Fix missing <stdarg.h>."

* commit '12e519cc39c8d9594b9d96b7a799b47e0696af75':