Merge "Move mallopt to correct section."
am: 15eaaddef9

Change-Id: I592a15ea6503f8753c9fdc512fa383d55f48525e