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

Change-Id: I9caa896da8ccfee1071eff2daacbe4ab89c1f2eb