Merge "Fix and deprecate TextUtils.join(Iterable<CharSequence>)."