Merge "Ignore null-pointer-arithmetic warnings in external/dlmalloc"