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

* commit 'ef0a3cfaf063ba36cb8515dc3698a30bc01b7fc3':