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

Change-Id: I3cf01f8072204cee4a0c7f5ab89a795eb5cbd866