Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am: 5d628b1e45

Change-Id: I4a2b24becdda847b7cf301d7224c218a1fab7dc7