Merge "Fix libcutils/dlmalloc_stubs.c build breakage."