am 13641010: Merge "Fix compile-time tests for LP64."

* commit '1364101067072c2ce6fa395cdef2534f338f30b1':
  Fix compile-time tests for LP64.