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

Change-Id: I7dc6e5c8db123137d428de5dd97e6b0223625946