Merge "Fix code for new malloc debug enable."
am: 1efb3e93e6

Change-Id: Ifbab90962878670fdacfc7b308afa46dce898f6d