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

* commit '81542db7c2cdf44803ba36be0f8cd76972790fc0':