Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-mr1-dev