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

Change-Id: I82dcf538b794de27d91acb8a64563a2af51c37bd