am 3cbcb87b: am a4f88fdc: Merge "Document the mallinfo struct, add missing attributes."

# Via Android Git Automerger (1) and others
* commit '3cbcb87bd1e86bd2bdb218fd324648e5bc7e8260':
  Document the mallinfo struct, add missing attributes.