Merge "Don't include malloc.h on MacOS" am: 7ca98bfba8
am: 2d1db36fbe

Change-Id: I5bccd9ce52fe3125a40efea7e7407155497c8b9d