am 821b26b0: Merge "Add missing <malloc.h> include."

* commit '821b26b0e07500c88d980e77bb12b647301c7335':
  Add missing <malloc.h> include.