Merge "Update java.lang.String class size."