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

Change-Id: I14dcdfcd556bdeb4dd905253b95083c71fd0c9fe