am c80c3a8f: am 17f2af7e: am a2b32b34: Merge "Update malloc.h"

* commit 'c80c3a8fd8bbbe4e131d6eda7bb5d9083512a743':
  Update malloc.h