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

Change-Id: Ib73fa8726635a0e04600edc4bf72123d57c235df