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

Change-Id: Ifa31427177d39080eb6ee4304c8725726165e5f3