Merge "Replace MallocHelper with std::unique_ptr." am: 8330d5212d
am: 6dfb0ca3d5

Change-Id: Ib4853eeb3e5524935780881a1758262d50ab8e29