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

Change-Id: I6e5ff69fcf71124b2aace69af4fca924e7e172a2