am bcedf3f0: (-s ours) am 647a0e7a: (-s ours) Merge "DO NOT MERGE - Implement MemChunk::registerAllocFreeCallbacks()."

* commit 'bcedf3f0480bf606f578f22732e1e3111dad3532':
  DO NOT MERGE - Implement MemChunk::registerAllocFreeCallbacks().