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

Change-Id: Ic678639dea3292dc380b39f6391c38c2339975ca