Merge "Ignore expansion-to-defined warning from dlmalloc include"
am: a54a660892

Change-Id: I0d214c2996647b1bd6ad35f9e6b0050c38206160