Merge "StringBuilder: Annotate local Android changes"