Merge "Fix compile-time tests for LP64."