Instead, move the MEMORY_TOOL_MAKE_* calls out-of-line. Bug: 24729377 This reverts commit d4cf1e4f. Change-Id: I9bccc8bd4a691a2d018b84de8b95bc68fafad4e1