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

Change-Id: Ib0859b0728a3ce2dfae3e08be0025730c7a4bfce