Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev