Merge "Do not hard-code any compileSdkVersion values in gradle." into nyc-support-25.1-dev