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