am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '18e754eebd3d3252e122034c46023df915dd89f6':
  Fix LP64 tombstone.cpp build failure.