Merge "Make SpannableStringBuilder.getSpans thread-safe" into nyc-mr2-dev