Merge "Fix code generation for String.<init> on x64."