Upgrading Android support library to r11