Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method"