Merge "Fix undefined args access for x86_64."