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

* commit '1829b14cd5887d510d8aedfc1a5b9fa636219525':
  Fix LP64 tombstone.cpp build failure.