Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev
am: 5b40d70ced

* commit '5b40d70ced417f1f29f8ce36bed3ecfb26278486':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: Ia3cba740ca5741033d88443534b075805a153f76