am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."

* commit 'fd5692b32c88306cfc800bdffb10a277d9cb080a':
  Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.