Upgrade to latest support library