am 07e1c409: Merge "Android always has <malloc.h>."

* commit '07e1c409acc375ae88b6cc73fe4541db529c9638':
  Android always has <malloc.h>.