Merge "Fix some test assumptions that are wrong for __LP64__."