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

Change-Id: I94f4d33626afc46992cf087a918769c243a052e8