am 4b47d9f9: am 4c001859: Merge "Fix declaration of malloc_usable_size()"

* commit '4b47d9f978296e5bb2eaabb8069960eb6f207c80':
  Fix declaration of malloc_usable_size()