With this change, I can now enable debug malloc fully. Bug: 19071092 (cherry picked from commit 9f66589f) Change-Id: I04d477d0294d67c5e3a9d9147889bdffb9086bd4