Merge "Ignore null-pointer-arithmetic warnings in external/dlmalloc" am: 045112c32c am: c5132e5d15
am: 3855bd78a6

Change-Id: I77d3f542de9c2d64fe7ac9f443db8ff392ef4dae