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