Upgrade Android support library #682