Merge "Revert "Make mallopt available in the future.""
am: 8f7a987cd0

Change-Id: I0db255e6778cd2cfb64206c3a2ec635e62a18e9a