Merge "Annotate support classes with RequiresApi / TargetApi"