Merge "Fix warning about undefined __LP64__"