Merge "Fix TextUtils#commaEllipsize" into honeycomb