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

* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
  Fix LP64 tombstone.cpp build failure.