Merge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev