Merge "Ignore null-pointer-arithmetic warning from dlmalloc include"
am: 25a83f0176

Change-Id: I28e8d63ea5df8f10d3a75c51a490c62d812b9c9a