Merge "Fix AbstractStringBuilder gaining extra APIs."