Merge "Allow to reset malloc hooks." am: 543b4013e7
am: 70dcd3db16

Change-Id: I008d032695246b66dbd3ce4fe3fbda3477498f2c