Merge "Fix AbstractStringBuilder gaining extra APIs."
am: b64859d899

* commit 'b64859d89999c1e87ae3980192a4987ba4baa002':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: I392e2dde81254d38abd48e2027d94ec960560ed5