Merge "Add textLocale attributes to TextView and TextAppearanceSpan"