am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '801411daca44a46338d8fa5e9015b85d94ecb471':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.