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

* commit '6d08a0d3fc108f80db47541b0ecbb89e99a99260':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.