C++: Don't duplicate heap management hook handling
C++: Don't duplicate heap management hook handling

Change-Id: I9eb31236567d4ad09c8073feed0c350606e4f0ae

Incubaid/crakoon,Incubaid/crakoon,Incubaid/crakoon,Incubaid/crakoon