Merge "Updated SpannableStringBuilderSpanTest for correct MARK/POINT" into jb-dev