Merge "change CompoundButton button to use the accessibility state API"