Merge "Fix LP64 tombstone.cpp build failure."