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

Change-Id: I8d4783f155334b5c681765b12b0f59c3e30a8bd5