Merge "Stop splitting support lib into modules in Android Studio." into nyc-support-25.1-dev