am a2b32b34: Merge "Update malloc.h"

* commit 'a2b32b34220a1bdea566502da1e3254c90f62f16':
  Update malloc.h