Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev