Merge "Annotate android.support.transition tests." into nyc-mr1-dev