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

* commit '17f2af7e1f08440814ade84898f6506e15fea15c':
  Update malloc.h